bugfix(gui): fix resolution and zoom scaling of unit information #1573

Mauller · 2025-09-13T17:17:20Z

This PR fixes the unit information scaling within the game.
It fixes the scaling and placement of the following:

health bar
veterancy icon
contained pips
ammo pips
enthusiastic and emoticon
healing icon
Bomb icons on structures
disabled icon
battleplan icons (These are currently disabled and have no data related to them so crash the game, but i tweaked the code to fix it)

The majority of the scaling now takes the zoom and difference in resolution, relative to the default resolution that the items were scaled for, into account.

Some of the scaling and placement of info is slightly altered relative to the original 800x600 implementation.
This was done as the original sizes of the information was considered excessive.

I have currently kept the bombed icon set to scale to half the size of a health bar, it makes it more obvious which buildings have been rigged. Prior to this the bombed icon was using the infantries health bar to scale itself and it was then placed at the feet of where the infantry unit used the ability instead of on the building.

Mauller · 2025-09-13T17:49:37Z

1920x1080 with the fixes from this

1920x1080 without the fixes

Mauller · 2025-09-15T07:08:01Z

Going to look back at the "Bombed" icons again and decouple them from the health bar size so they have a consistent size.

Mauller · 2025-09-15T17:32:15Z

Some update on scaling the bombed icon to be a fixed size instead of scaling with the size of the health bar

And on a car

Mauller · 2025-09-15T17:34:13Z

Fixed size on lower building with timed charge vs health scaling remote bomb on other building

Mauller · 2025-09-15T18:23:43Z

Consistant size now for timed and remote charges

Mauller · 2025-09-15T18:45:47Z

Pushed the tweaked Timed and remote bomb scaling to be uniform in size now.

xezon

I think this would be easier to review if refactors and scaling changes were separated in more separated commits.

I only tested this change in 800 x 600, side by side with the Original Game and just a few of the icons.

Here are my thoughts.

Zoom scaling is nice and ideally is an option in InGameUI.ini, enabled by default.
Icon scaling depending on object size ideally is an option in InGameUI.ini, turned off by default.
Thicker health bar outline should be configurable in InGameUI.ini, set to original size by default.
Default icon size needs more consideration. It would be good to have an option to use exactly the original icon scaling, and then build all the new scaling on top of that.

Perhaps split this change into more changes. First do the refactor, then do the zoom scaling. And then do the resizing of icons with options.

Ammo icon - Original left, Patch right

Ammo icons are too narrow and small in Patch.

Cargo icon - Original left, Patch right

Cargo icons are too narrow and small in Patch.

Disabled icon - Original left, Patch right

Disabled icons are noticably smaller than original.

Propaganda icon - Original left, Patch right

Propaganda icons now have a per object scale.

Repair icon - Original left, Patch right

Repair icons are significantly smaller than original.

xezon · 2025-09-17T06:25:40Z

GeneralsMD/Code/GameEngine/Source/GameClient/Display.cpp

 }

+// Display::getWidthScale =========================================================
+/** Return the ratio of the current display width relative to the default resolution */


Please do not use /* for comments. It screws with syntax highlighting in diff tools (when spanning multiple lines).

replicating the style of the original code that is currently in place.

There are // just below the new function.

GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DView.cpp

xezon · 2025-09-17T06:30:03Z

GeneralsMD/Code/GameEngine/Source/GameClient/Display.cpp

+//=============================================================================
+Real Display::getHeightScale(void)
+{
+	return INT_TO_REAL(m_height) / DEFAULT_DISPLAY_HEIGHT;


Can just use (Real)m_height?

xezon · 2025-09-17T06:33:37Z

GeneralsMD/Code/GameEngine/Source/GameClient/Drawable.cpp

-				Int frameWidth = getIconInfo()->m_icon[ ICON_CARBOMB ]->getCurrentFrameWidth();
-				Int frameHeight = getIconInfo()->m_icon[ ICON_CARBOMB ]->getCurrentFrameHeight();
+			Int barWidth = healthBarRegion->width();;
+			Int barHeight = healthBarRegion->height();;


xezon · 2025-09-17T06:34:12Z

GeneralsMD/Code/GameEngine/Source/GameClient/Drawable.cpp

 	else
-	{
 		killIcon(ICON_CARBOMB);
-	}


Prefer not deleting { } if the other side of the branch does have { }

xezon · 2025-09-17T06:35:47Z

GeneralsMD/Code/GameEngine/Source/GameClient/Drawable.cpp

-		Real healthBoxOutlineSize = 1.0f;
+		Real healthBoxWidth = healthBarRegion->width();
+		Real healthBoxHeight = max(3, healthBarRegion->height());
+		Real healthBoxOutlineSize = 2.0f;


This looks like a style change. Why is this done?

It makes it clearer to see the reduction in health relative to the outline of the health bar.

Mauller · 2025-09-17T07:30:51Z

I did not scale many of these 1:1 with their original 800x600 scaling in the end because when i originally did that they become obnoxiously large relative to units or buildings at higher resolutions.

in regards to some of them, with the contained pip, yes they are larger when zoomed out, but the moment you zoom in they significantly shrink in size instead of remaining at a consistent size.

The ammo pips do the same thing, they considerably shrink in size compared to being over sized when zoomed out.

The enthusiastic / propaganda icons were over sized for a lot of units with their original scaling, they were nearly the size of an overlord in that particular instance but considerably shrink when you zoom since they don't maintain scaling when zooming.

The repair icon might look smaller at 800x600 when zoomed out, but when zoomed in it becomes too small in the original code etc.

Many of the things don't maintain consistent scaling in the original code so when zoomed out at 800x600 they are often significantly larger than they should be. And when that size is maintained with their scaling fixed while zooming, they become obnoxiously large at higher resolutions.

Mauller · 2025-09-17T07:45:32Z

I will look at splitting out the changes into separate commits later.

Mauller · 2025-09-17T07:47:33Z

Also these changes are part of Drawable and have nothing to do with InGameUi.

xezon · 2025-09-17T07:58:11Z

I am not opposed to changing some defaults, but I think overall defaults should be close to the original, and then make new tweaks opt-in, to give designers the freedom to fine tune it. It should not be the programmers job to fine tune the appearance.

Mauller · 2025-09-19T15:50:15Z

I will break this out then into changes that first fix the resolution scaling for everything, then add the zoom scaling for things that did not originally have it.

Mauller self-assigned this Sep 13, 2025

Mauller added Bug Something is not working right, typically is user facing GUI For graphical user interface Major Severity: Minor < Major < Critical < Blocker Gen Relates to Generals labels Sep 13, 2025

bugfix(gui): fix resolution and zoom scaling of unit information

b3e7544

Mauller force-pushed the fix-scaling-unit-gui branch from 6a466c8 to b3e7544 Compare September 15, 2025 18:44

xezon reviewed Sep 17, 2025

View reviewed changes

xezon mentioned this pull request Sep 20, 2025

bugfix(gui): implement resolution scaling for unit health and info #1607

Open

bugfix(gui): fix resolution and zoom scaling of unit information #1573

Are you sure you want to change the base?

bugfix(gui): fix resolution and zoom scaling of unit information #1573

Conversation

Mauller commented Sep 13, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Mauller commented Sep 13, 2025

Uh oh!

Mauller commented Sep 15, 2025

Uh oh!

Mauller commented Sep 15, 2025

Uh oh!

Mauller commented Sep 15, 2025

Uh oh!

Mauller commented Sep 15, 2025

Uh oh!

Mauller commented Sep 15, 2025

Uh oh!

xezon left a comment

Choose a reason for hiding this comment

Ammo icon - Original left, Patch right

Cargo icon - Original left, Patch right

Disabled icon - Original left, Patch right

Propaganda icon - Original left, Patch right

Repair icon - Original left, Patch right

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Mauller commented Sep 17, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Mauller commented Sep 17, 2025

Uh oh!

Mauller commented Sep 17, 2025

Uh oh!

xezon commented Sep 17, 2025

Uh oh!

Mauller commented Sep 19, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Mauller commented Sep 13, 2025 •

edited

Loading

Mauller commented Sep 17, 2025 •

edited

Loading